commit 677f4b5f95544b75ca17afa3539f4260c311455d
Merge: 308d2cb 2b26355
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Mon Jan 12 13:18:34 2026 -0500

    merge conflicts

commit 308d2cb
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Wed Dec 31 13:51:48 2025 -0500

    Revert "Merge branch 'dev' of github.com:open-webui/open-webui into feat/google-oauth-groups-lgarceau"

    This reverts commit 6dd6e0c, reversing
    changes made to dd1e2b5.

commit 6dd6e0c
Merge: dd1e2b5 fe3047d
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Mon Dec 29 17:14:48 2025 -0500

    Merge branch 'dev' of github.com:open-webui/open-webui into feat/google-oauth-groups-lgarceau

commit dd1e2b5
Merge: 943e4ca a727153
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Mon Dec 29 16:05:54 2025 -0500

    Merge branch 'main' of personal:flexion/open-webui into feat/google-oauth-groups-lgarceau

commit 943e4ca
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Mon Dec 29 16:05:52 2025 -0500

    resolve oauth issues

commit 4b34300
Merge: 6f1486f 9eb4484
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Tue Dec 9 16:51:53 2025 -0500

    init implementation commit

commit 9eb4484
Merge: e0d5de1 d277696
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Thu Nov 27 15:46:49 2025 -0500

    Merge pull request #2 from lgarceau768/main

    Version 0.6.34 Updates

commit d277696
Merge: 6c86ff7 e0d5de1
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Sat Nov 22 11:24:58 2025 -0500

    Merge branch 'main' into main

commit 6c86ff7
Merge: 7a83e7d 6dbc01c
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Wed Nov 5 12:05:23 2025 -0500

    Merge pull request #1 from lgarceau768/feat/google-groups

    Google Groups Functionaliity on top of version 0.6.34

commit 6dbc01c
Merge: 7a83e7d cc6a1a7
Author: Luke Garceau <ltgarc768@gmail.com>
Date:   Wed Nov 5 10:44:30 2025 -0500

    - resolve merge conflicts

commit cc6a1a7
Author: Brice Ruth <bruth@flexion.us>
Date:   Mon Jun 16 18:18:52 2025 -0500

    update tests for adjusted query string & payload

commit 64ce040
Author: Brice Ruth <bruth@flexion.us>
Date:   Mon Jun 16 17:49:42 2025 -0500

    fix google cloud identity query string

commit a909fd9
Author: Brice Ruth <bruth@flexion.us>
Date:   Mon Jun 16 11:35:47 2025 -0500

    feat: Add Google Cloud Identity API support for OAuth group-based roles

    Enables Google Workspace group-based role assignment by integrating with
    Google Cloud Identity API to fetch user groups in real-time.

    Key improvements:
    - Fetches groups directly from Google API using cloud-identity.groups.readonly scope
    - Enables admin role assignment based on Google group membership
    - Maintains full backward compatibility with existing OAuth configurations
    - Includes comprehensive test suite with proper async mocking
    - Complete documentation with Google Cloud Console setup guide

    Addresses limitation where Google Workspace doesn't include group membership
    claims in OAuth JWT tokens, preventing group-based role assignment.

    🤖 Generated with [Claude Code](https://claude.ai/code)

    Co-Authored-By: Claude <noreply@anthropic.com>